Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 21:13:12 +0000 (16:13 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 16 Jan 2010 21:13:12 +0000 (16:13 -0500)
commit64adef08917fb2f6dd6c21fb72e686e6a7e69bbf
tree704084d0f1224e4d4407ae7c2230cf4567db8ccb
parentaafd9b04a7581ae992252a2c429d3f9a8bddb32d
parentadf8cf1bc3807bf29aadcf05b2a6df0a7f2bab0c
Merge from mainline.